adding support for remaining elements