introduce proper handling of code properties