Postfix main/master and attributes refactor