Template changes

Added template arguments for checking proper library linking.