Added check for system constructors and fixed systems