Added markers as parameters for create statement
Added more details for each component
Removed doubled up filtering
Fixed file permissions