Cleaned up Construtor extension and build parent extension