Fixed wrong functions declaration
Fixed constructors