working composite keys added